endSessionDialog: clean up appearance

This commit lines up the app list with the description,
adds spacing between controls of the dialog, and increases
the wrap width of the text.

https://bugzilla.gnome.org/show_bug.cgi?id=641375

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 0ac243f007798436a951081f116b91742c80b65e..e26c1624971ac6496291b6f6578bf8181bae596b 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1350,6 +1350,10 @@ StTooltip StLabel {
     padding-top: 30px;
 }
 
+.modal-dialog-button-box {
+    spacing: 21px;
+}
+
 .modal-dialog-button {
     border: 1px solid #8b8b8b;
     border-radius: 18px;
@@ -1421,6 +1425,10 @@ StTooltip StLabel {
 }
 
 /* End Session Dialog */
+.end-session-dialog {
+    spacing: 42px;
+}
+
 .end-session-dialog-subject {
     font-size: 12pt;
     font-weight: bold;
@@ -1439,13 +1447,11 @@ StTooltip StLabel {
     font-size: 10pt;
     color: white;
     padding-left: 17px;
-    padding-right: 40px;
-    width: 16em;
+    width: 28em;
 }
 
 .end-session-dialog-description:rtl {
     padding-right: 17px;
-    padding-left: 40px;
 }
 
 .end-session-dialog-logout-icon {
@@ -1464,13 +1470,12 @@ StTooltip StLabel {
     font-size: 10pt;
     max-height: 200px;
     padding-top: 42px;
-    padding-bottom: 42px;
-    padding-left: 17px;
+    padding-left: 49px;
     padding-right: 32px;
 }
 
 .end-session-dialog-app-list:rtl {
-    padding-right: 17px;
+    padding-right: 49px;
     padding-left: 32px;
 }
 

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 55aa05a65df0235f8345ae3bf9a40e0be48fa794..f221d7e2c957afca67043ae7e0f05284e114709f 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -233,7 +233,7 @@ EndSessionDialog.prototype = {
     __proto__: ModalDialog.ModalDialog.prototype,
 
     _init: function() {
-        ModalDialog.ModalDialog.prototype._init.call(this);
+        ModalDialog.ModalDialog.prototype._init.call(this, { styleClass: 'end-session-dialog' });
 
         this._user = Gdm.UserManager.ref_default().get_user(GLib.get_user_name());
 

diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 4b891f5ea549675ab5a6aa89bc6331ced880126e..802f9c90fd72ac4dd0e7cc72594b112dbe20e5f6 100644 (file)
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -87,8 +87,9 @@ ModalDialog.prototype = {
                                  x_align: St.Align.MIDDLE,
                                  y_align: St.Align.START });
 
-        this._buttonLayout = new St.BoxLayout({ opacity:  220,
-                                                vertical: false });
+        this._buttonLayout = new St.BoxLayout({ style_class: 'modal-dialog-button-box',
+                                                opacity:     220,
+                                                vertical:    false });
         this._dialogLayout.add(this._buttonLayout,
                                { expand:  true,
                                  x_align: St.Align.MIDDLE,